Allow face-remapping using :font, and use it in mouse-appearance-menu.
authorChong Yidong <cyd@gnu.org>
Fri, 17 Aug 2012 09:10:31 +0000 (17:10 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 17 Aug 2012 09:10:31 +0000 (17:10 +0800)
commit3fc42c60834b6d7b1a18fcc4b45b66d202cc8e8e
tree6cd6fff71f78dfb34c6627bc295ae556a3e4e5b2
parenteb6b903f728e8a0d0dea5ead7144b28ea51fd3d6
Allow face-remapping using :font, and use it in mouse-appearance-menu.

* mouse.el (mouse-appearance-menu): If x-select-font returns a
font spec, set the font directly.

* xfaces.c (merge_face_vectors): If the target font specfies a
font spec, make the font's attributes take precedence over
directly-specified attributes.
(merge_face_ref): Recognize :font.
lisp/ChangeLog
lisp/mouse.el
src/ChangeLog
src/xfaces.c